Merge tag 'upstream/2017.1' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 27 Jan 2017 08:58:18 +0000 (08:58 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 27 Jan 2017 08:58:18 +0000 (08:58 +0000)
commit1b4cf712018562ec12c5d23d7c897b8a5c5300b5
tree480666879cf7914b99aa11c9a8218f88d8673896
parent24daa507906dae11bc88772c3c0412b090bfce54
parent6ee013cea0c1405aaffcadb03621763f26a19ff2
Merge tag 'upstream/2017.1' into debian/master

Upstream version 2017.1